Use columns for file name, directory, and state when files are shown as a list in TreeViews. Resolves Dense layout issue #547 #632
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…as a list in TreeViews. Resolves Dense layout issue Murmele#547
Murmele
reviewed
Nov 12, 2023
Comment on lines
-13
to
-43
| // Draw >. | ||
| if (mDrawArrow && index.model()->hasChildren(index)) { | ||
| painter->save(); | ||
| painter->setRenderHint(QPainter::Antialiasing, true); | ||
|
|
||
| QColor color = opt.palette.color(QPalette::Active, QPalette::BrightText); | ||
| if (opt.state & QStyle::State_Selected) | ||
| color = | ||
| !opt.showDecorationSelected | ||
| ? opt.palette.color(QPalette::Active, QPalette::WindowText) | ||
| : opt.palette.color(QPalette::Active, QPalette::HighlightedText); | ||
|
|
||
| painter->setPen(color); | ||
| painter->setBrush(color); | ||
|
|
||
| int x = opt.rect.x() + opt.rect.width() - 3; | ||
| int y = opt.rect.y() + (opt.rect.height() / 2); | ||
|
|
||
| QPainterPath path; | ||
| path.moveTo(x, y); | ||
| path.lineTo(x - 5, y - 3); | ||
| path.lineTo(x - 5, y + 3); | ||
| path.closeSubpath(); | ||
| painter->drawPath(path); | ||
|
|
||
| painter->restore(); | ||
|
|
||
| // Adjust rect to exclude the arrow. | ||
| opt.rect.adjust(0, 0, -11, 0); | ||
| } | ||
|
|
There was a problem hiding this comment.
Fine, can be removed because it will be set always to false in the DoubleTreeWidget
Murmele
reviewed
Nov 12, 2023
Comment on lines
-163
to
-169
| TreeProxy *treewrapperStaged = new TreeProxy(true, this); | ||
| treewrapperStaged->setSourceModel(mDiffTreeModel); | ||
| stagedFiles->setModel(treewrapperStaged); | ||
| stagedFiles->setHeaderHidden(true); | ||
| ViewDelegate *stagedDelegate = new ViewDelegate(); | ||
| stagedDelegate->setDrawArrow(false); | ||
| stagedFiles->setItemDelegateForColumn(0, stagedDelegate); |
Murmele
reviewed
Nov 12, 2023
Comment on lines
-195
to
-201
| TreeProxy *treewrapperUnstaged = new TreeProxy(false, this); | ||
| treewrapperUnstaged->setSourceModel(mDiffTreeModel); | ||
| unstagedFiles->setModel(treewrapperUnstaged); | ||
| unstagedFiles->setHeaderHidden(true); | ||
| ViewDelegate *unstagedDelegate = new ViewDelegate(); | ||
| unstagedDelegate->setDrawArrow(false); | ||
| unstagedFiles->setItemDelegateForColumn(0, unstagedDelegate); |
Murmele
reviewed
Nov 12, 2023
Comment on lines
-26
to
-27
| TreeProxy::TreeProxy(bool staged, QObject *parent) | ||
| : QSortFilterProxyModel(parent), mStaged(staged) {} |
Murmele
reviewed
Nov 12, 2023
Comment on lines
+51
to
+53
| connect(RepoView::parentView(this)->repo().notifier(), | ||
| &git::RepositoryNotifier::referenceUpdated, this, | ||
| &TreeView::updateView); |
There was a problem hiding this comment.
Why do you need this explicitly? An update comes from the DoubleTreewidget
|
In your build single column listview is anymore possible, It would be nice to have this possibility |
|
Something is not working yet |
Murmele
requested changes
Nov 12, 2023
|
closed in favour of #664 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The new list view looks like this:
